Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Dockerfile to pull manifests from different component repo #431

Merged
merged 6 commits into from
Sep 15, 2023

Conversation

zdtsw
Copy link
Member

@zdtsw zdtsw commented Aug 10, 2023

Description

  • leave notebook, modelmesh, monitoring as-is from odh-manifests
  • the old implmenetation is to get all from odh-manifests, the new one is to only get above listed from odh-manifests, the rest are defined as a list in makefile.
  • another difference is the kserve. the old implementation gets its manifests from odh-manifests which is the "outcome" of kustomize build, the new implementation is to copy over from kserve git repo (which are the source of the odh-manifests part) so no need "base" in the path
  • move fetch logic into get_all_aminfests.sh
  • instruction of how to fetch manifests has been added into README

ref: #424

How Has This Been Tested?

UPDATES:
new local build image: from 14th Sep quay.io/wenzhou/opendatahub-operator-catalog:v2.9.424

OLD:
Screenshot from 2023-08-10 10-02-30
Screenshot from 2023-08-10 10-38-07

Merge criteria:

  • The commits are squashed in a cohesive manner and have meaningful messages.
  • Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
  • The developer has manually tested the changes and verified that the changes work

@zdtsw zdtsw requested a review from etirelli August 10, 2023 08:50
@zdtsw zdtsw force-pushed the issue/424 branch 4 times, most recently from cfef6a3 to 2f9ed14 Compare August 11, 2023 08:37
@zdtsw zdtsw changed the base branch from feature-rearchitecture to main August 14, 2023 07:04
@zdtsw zdtsw force-pushed the issue/424 branch 5 times, most recently from 559d9c8 to 7f7be0c Compare August 19, 2023 15:35
Copy link
Contributor

@etirelli etirelli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@VaishnaviHire
Copy link
Member

/hold

Till we get update from components and corresponding ADR is merged

@zdtsw
Copy link
Member Author

zdtsw commented Aug 22, 2023

/hold

Till we get update from components and corresponding ADR is merged

should we get this one out first and keep migrating the rest 2 components?
so they can comment out the theirs from dockerfile and test locally

@zdtsw
Copy link
Member Author

zdtsw commented Aug 23, 2023

/test opendatahub-operator-e2e

@zdtsw
Copy link
Member Author

zdtsw commented Aug 29, 2023

/test opendatahub-operator-e2e

@zdtsw
Copy link
Member Author

zdtsw commented Sep 5, 2023

@zdtsw
Copy link
Member Author

zdtsw commented Sep 13, 2023

/hold

need to get opendatahub-io/notebooks#186 in first

@zdtsw
Copy link
Member Author

zdtsw commented Sep 13, 2023

/unhold

notebook-images has been updated to get manifets from opendatahub-io/notebooks

- leave notebook, modelmesh, monitoring as-is from odh-manifests
- change kserve path to where it sets in source repo.
- move download manifests function into a script
- make Dockerfile a multi-stage build
- add empty odh-amnifests for ci build
- odh-modelmesh-controller has new path in odh-manifests
- kserve does not have 'base' in component repo

Signed-off-by: Wen Zhou <wenzhou@redhat.com>
Signed-off-by: Wen Zhou <wenzhou@redhat.com>
Signed-off-by: Wen Zhou <wenzhou@redhat.com>
Signed-off-by: Wen Zhou <wenzhou@redhat.com>
Signed-off-by: Wen Zhou <wenzhou@redhat.com>
Copy link
Member

@VaishnaviHire VaishnaviHire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci
Copy link

openshift-ci bot commented Sep 15, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: etirelli, VaishnaviHire

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [VaishnaviHire,etirelli]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 6880557 into opendatahub-io:main Sep 15, 2023
5 checks passed
VaishnaviHire pushed a commit to VaishnaviHire/opendatahub-operator that referenced this pull request Sep 29, 2023
…endatahub-io#431)

* Update Dockerfile to pull manifests from different component repo

- leave notebook, modelmesh, monitoring as-is from odh-manifests
- change kserve path to where it sets in source repo.
- move download manifests function into a script
- make Dockerfile a multi-stage build
- add empty odh-amnifests for ci build
- odh-modelmesh-controller has new path in odh-manifests
- kserve does not have 'base' in component repo

Signed-off-by: Wen Zhou <wenzhou@redhat.com>

* Update kserve release branch

Signed-off-by: Wen Zhou <wenzhou@redhat.com>

* Update manifests path for kserve

- see https://github.com/opendatahub-io/odh-manifests/blob/master/kserve/hack/kustomization.yaml

Signed-off-by: Wen Zhou <wenzhou@redhat.com>

* Update notebook-images to use manifests from its repo

Signed-off-by: Wen Zhou <wenzhou@redhat.com>

* Fix: path for kserve

Signed-off-by: Wen Zhou <wenzhou@redhat.com>

* Docs: update README

Signed-off-by: Wen Zhou <wenzhou@redhat.com>

---------

Signed-off-by: Wen Zhou <wenzhou@redhat.com>
(cherry picked from commit 6880557)
VaishnaviHire pushed a commit to VaishnaviHire/opendatahub-operator that referenced this pull request Sep 29, 2023
…endatahub-io#431)

* Update Dockerfile to pull manifests from different component repo

- leave notebook, modelmesh, monitoring as-is from odh-manifests
- change kserve path to where it sets in source repo.
- move download manifests function into a script
- make Dockerfile a multi-stage build
- add empty odh-amnifests for ci build
- odh-modelmesh-controller has new path in odh-manifests
- kserve does not have 'base' in component repo

Signed-off-by: Wen Zhou <wenzhou@redhat.com>

* Update kserve release branch

Signed-off-by: Wen Zhou <wenzhou@redhat.com>

* Update manifests path for kserve

- see https://github.com/opendatahub-io/odh-manifests/blob/master/kserve/hack/kustomization.yaml

Signed-off-by: Wen Zhou <wenzhou@redhat.com>

* Update notebook-images to use manifests from its repo

Signed-off-by: Wen Zhou <wenzhou@redhat.com>

* Fix: path for kserve

Signed-off-by: Wen Zhou <wenzhou@redhat.com>

* Docs: update README

Signed-off-by: Wen Zhou <wenzhou@redhat.com>

---------

Signed-off-by: Wen Zhou <wenzhou@redhat.com>
(cherry picked from commit 6880557)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants